binutils: Fix CVE-2025-69648
PATCH 1/4 binutils: Fix CVE-2025-69648
From: Deepak Rathore <[email protected]>
Pick the patch [1] as mentioned in [2].
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33
[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69648
meta/recipes-devtools/binutils/binutils-2.45.inc +1 -0
@@ -46,4 +46,5 @@ SRC_URI = "\ file://0018-CVE-2025-11494.patch \ file://0019-CVE-2025-11839.patch \ file://0020-CVE-2025-11840.patch \ + file://CVE-2025-69648.patch \ "
meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch new file +188 -0
188 lines not on this page · raw message
Signature · 1 line
2.35.6
PATCH v2 1/4 binutils: Fix CVE-2025-69648
From: Deepak Rathore <[email protected]>
pick the patch [1] as mentioned in [2]
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33
[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69648
meta/recipes-devtools/binutils/0001-pick-the-patch-1-as-mentioned-in-2.patch new file +222 -0
@@ -0,0 +1,222 @@ +From 507f05eb8f3a132a536c593e232fdc7878fb9bba Mon Sep 17 00:00:00 2001 +From: Deepak Rathore <[email protected]> +Date: Tue, 31 Mar 2026 11:25:32 +0000 +Subject: [PATCH] pick the patch [1] as mentioned in [2]. + +[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33 +[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69648 + +Signed-off-by: Deepak Rathore <[email protected]> +--- + .../binutils/binutils-2.45.inc | 1 + + .../binutils/binutils/CVE-2025-69648.patch | 188 ++++++++++++++++++ + 2 files changed, 189 insertions(+) + create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch + +diff --git a/meta/recipes-devtools/binutils/binutils-2.45.inc b/meta/recipes-devtools/binutils/binutils-2.45.inc +index 16a63cabc5..b6d7b3d60f 100644 +--- a/meta/recipes-devtools/binutils/binutils-2.45.inc ++++ b/meta/recipes-devtools/binutils/binutils-2.45.inc +@@ -46,4 +46,5 @@ SRC_URI = "\ + file://0018-CVE-2025-11494.patch \ + file://0019-CVE-2025-11839.patch \ + file://0020-CVE-2025-11840.patch \ ++ file://CVE-2025-69648.patch \ + " +diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch b/meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch +new file mode 100644 +index 0000000000..2346b18f01 +--- /dev/null ++++ b/meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch +@@ -0,0 +1,188 @@ ++From 7df481dd76c05c89782721e9df5468be829c356b Mon Sep 17 00:00:00 2001 ++From: Alan Modra <[email protected]> ++Date: Sat, 22 Nov 2025 09:22:10 +1030 ++Subject: [PATCH] PR 33638, debug_rnglists output ++ ++The fuzzed testcase in this PR continuously outputs an error about ++the debug_rnglists header. Fixed by taking notice of the error and ++stopping output. The patch also limits the length in all cases, not ++just when a relocation is present, and limits the offset entry count ++read from the header. I removed the warning and the test for relocs ++because the code can't work reliably with unresolved relocs in the ++length field. ++ ++ PR 33638 ++ * dwarf.c (display_debug_rnglists_list): Return bool. Rename ++ "inital_length" to plain "length". Verify length is large ++ enough to read header. Limit length to rest of section. ++ Similarly limit offset_entry_count. ++ (display_debug_ranges): Check display_debug_rnglists_unit_header ++ return status. Stop output on error. ++ ++CVE: CVE-2025-69648 ++Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33] ++ ++(cherry picked from commit 598704a00cbac5e85c2bedd363357b5bf6fcee33) ++Signed-off-by: Deepak Rathore <[email protected]> ++--- ++ binutils/dwarf.c | 67 ++++++++++++++++++++++++------------------------ ++ 1 file changed, 34 insertions(+), 33 deletions(-) ++ ++diff --git a/binutils/dwarf.c b/binutils/dwarf.c ++index f4bcb677761..b4fb56351ec 100644 ++--- a/binutils/dwarf.c +++++ b/binutils/dwarf.c ++@@ -8282,7 +8282,7 @@ display_debug_rnglists_list (unsigned char * start, ++ return start; ++ } ++ ++-static int +++static bool ++ display_debug_rnglists_unit_header (struct dwarf_section * section, ++ uint64_t * unit_offset, ++ unsigned char * poffset_size) ++@@ -8290,7 +8290,8 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, ++ uint64_t start_offset = *unit_offset; ++ unsigned char * p = section->start + start_offset; ++ unsigned char * finish = section->start + section->size; ++- uint64_t initial_length; +++ unsigned char * hdr; +++ uint64_t length; ++ unsigned char segment_selector_size; ++ unsigned int offset_entry_count; ++ unsigned int i; ++@@ -8299,66 +8300,59 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, ++ unsigned char offset_size; ++ ++ /* Get and check the length of the block. */ ++- SAFE_BYTE_GET_AND_INC (initial_length, p, 4, finish); +++ SAFE_BYTE_GET_AND_INC (length, p, 4, finish); ++ ++- if (initial_length == 0xffffffff) +++ if (length == 0xffffffff) ++ { ++ /* This section is 64-bit DWARF 3. */ ++- SAFE_BYTE_GET_AND_INC (initial_length, p, 8, finish); +++ SAFE_BYTE_GET_AND_INC (length, p, 8, finish); ++ *poffset_size = offset_size = 8; ++ } ++ else ++ *poffset_size = offset_size = 4; ++ ++- if (initial_length > (size_t) (finish - p)) ++- { ++- /* If the length field has a relocation against it, then we should ++- not complain if it is inaccurate (and probably negative). ++- It is copied from .debug_line handling code. */ ++- if (reloc_at (section, (p - section->start) - offset_size)) ++- initial_length = finish - p; ++- else ++- { ++- warn (_("The length field (%#" PRIx64 ++- ") in the debug_rnglists header is wrong" ++- " - the section is too small\n"), ++- initial_length); ++- return 0; ++- } ++- } ++- ++- /* Report the next unit offset to the caller. */ ++- *unit_offset = (p - section->start) + initial_length; +++ if (length < 8) +++ return false; ++ ++ /* Get the other fields in the header. */ +++ hdr = p; ++ SAFE_BYTE_GET_AND_INC (version, p, 2, finish); ++ SAFE_BYTE_GET_AND_INC (address_size, p, 1, finish); ++ SAFE_BYTE_GET_AND_INC (segment_selector_size, p, 1, finish); ++ SAFE_BYTE_GET_AND_INC (offset_entry_count, p, 4, finish); ++ ++ printf (_(" Table at Offset: %#" PRIx64 ":\n"), start_offset); ++- printf (_(" Length: %#" PRIx64 "\n"), initial_length); +++ printf (_(" Length: %#" PRIx64 "\n"), length); ++ printf (_(" DWARF version: %u\n"), version); ++ printf (_(" Address size: %u\n"), address_size); ++ printf (_(" Segment size: %u\n"), segment_selector_size); ++ printf (_(" Offset entries: %u\n"), offset_entry_count); ++ +++ if (length > (size_t) (finish - hdr)) +++ length = finish - hdr; +++ +++ /* Report the next unit offset to the caller. */ +++ *unit_offset = (hdr - section->start) + length; +++ ++ /* Check the fields. */ ++ if (segment_selector_size != 0) ++ { ++ warn (_("The %s section contains " ++ "unsupported segment selector size: %d.\n"), ++ section->name, segment_selector_size); ++- return 0; +++ return false; ++ } ++ ++ if (version < 5) ++ { ++ warn (_("Only DWARF version 5+ debug_rnglists info " ++ "is currently supported.\n")); ++- return 0; +++ return false; ++ } ++ +++ uint64_t max_off_count = (length - 8) / offset_size; +++ if (offset_entry_count > max_off_count) +++ offset_entry_count = max_off_count; ++ if (offset_entry_count != 0) ++ { ++ printf (_("\n Offsets starting at %#tx:\n"), p - section->start); ++@@ -8372,7 +8366,7 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, ++ } ++ } ++ ++- return 1; +++ return true; ++ } ++ ++ static bool ++@@ -8404,6 +8398,7 @@ display_debug_ranges (struct dwarf_section *section, ++ uint64_t last_offset = 0; ++ uint64_t next_rnglists_cu_offset = 0; ++ unsigned char offset_size; +++ bool ok_header = true; ++ ++ if (bytes == 0) ++ { ++@@ -8493,8 +8488,12 @@ display_debug_ranges (struct dwarf_section *section, ++ /* If we've moved on to the next compile unit in the rnglists section - dump the unit header(s). */ ++ if (is_rnglists && next_rnglists_cu_offset < offset) ++ { ++- while (next_rnglists_cu_offset < offset) ++- display_debug_rnglists_unit_header (section, &next_rnglists_cu_offset, &offset_size); +++ while (ok_header && next_rnglists_cu_offset < offset) +++ ok_header = display_debug_rnglists_unit_header (section, +++ &next_rnglists_cu_offset, +++ &offset_size); +++ if (!ok_header) +++ break; ++ printf (_(" Offset Begin End\n")); ++ } ++ ++@@ -8548,10 +8547,12 @@ display_debug_ranges (struct dwarf_section *section, ++ } ++ ++ /* Display trailing empty (or unreferenced) compile units, if any. */ ++- if (is_rnglists) +++ if (is_rnglists && ok_header) ++ while (next_rnglists_cu_offset < section->size) ++- display_debug_rnglists_unit_header (section, &next_rnglists_cu_offset, &offset_size); ++- +++ if (!display_debug_rnglists_unit_header (section, +++ &next_rnglists_cu_offset, +++ &offset_size)) +++ break; ++ putchar ('\n'); ++ ++ free (range_entries); ++-- ++2.35.6 +-- +2.51.0 +
meta/recipes-devtools/binutils/binutils-2.45.inc +1 -0
@@ -46,4 +46,5 @@ SRC_URI = "\ file://0018-CVE-2025-11494.patch \ file://0019-CVE-2025-11839.patch \ file://0020-CVE-2025-11840.patch \ + file://CVE-2025-69648.patch \ "
meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch new file +189 -0
189 lines not on this page · raw message
Signature · 1 line
2.35.6
Patchtest results for [OE-core][whinlatter][PATCH v2 1/4] binutils: Fix CVE-2025-69648
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:
---
Testing patch /home/patchtest/share/mboxes/whinlatter-v2-1-4-binutils-Fix-CVE-2025-69648.patch
FAIL: test Upstream-Status presence: Added patch file is missing Upstream-Status: <Valid status> in the commit message (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)
SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
---
Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
Quoted 17 lines · Deepak Rathore via lists.openembedded.org
From: Deepak Rathore <[email protected]>
pick the patch [1] as mentioned in [2]
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33
[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69648Signed-off-by Deepak Rathore <[email protected]>meta/recipes-devtools/binutils/0001-pick-the-patch-1-as-mentioned-in-2.patch new file +2
-0@@ -0,0 +1,222 @@ +From 507f05eb8f3a132a536c593e232fdc7878fb9bba Mon Sep 17 00:00:00 2001 +From: Deepak Rathore <[email protected]>
meta/recipes-devtools/binutils/0001-pick-the-patch-1-as-mentioned-in-2.patch line 12
Quoted 10 lines
meta/recipes-devtools/binutils/0001-pick-the-patch-1-as-mentioned-in-2.patch new file +10
-0+Date: Tue, 31 Mar 2026 11:25:32 +0000 +Subject: [PATCH] pick the patch [1] as mentioned in [2]. + +[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33 +[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69648 + +Signed-off-by: Deepak Rathore <[email protected]> +--- + .../binutils/binutils-2.45.inc | 1 + + .../binutils/binutils/CVE-2025-69648.patch | 188 ++++++++++++++++++
That added patch is targeted at oe-core not binutils? Something went wrong...
Quoted 415 lines
meta/recipes-devtools/binutils/0001-pick-the-patch-1-as-mentioned-in-2.patch new file +210
-0+ 2 files changed, 189 insertions(+) + create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch + +diff --git a/meta/recipes-devtools/binutils/binutils-2.45.inc b/meta/recipes-devtools/binutils/binutils-2.45.inc +index 16a63cabc5..b6d7b3d60f 100644 +--- a/meta/recipes-devtools/binutils/binutils-2.45.inc ++++ b/meta/recipes-devtools/binutils/binutils-2.45.inc +@@ -46,4 +46,5 @@ SRC_URI = "\ + file://0018-CVE-2025-11494.patch \ + file://0019-CVE-2025-11839.patch \ + file://0020-CVE-2025-11840.patch \ ++ file://CVE-2025-69648.patch \ + " +diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch b/meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch +new file mode 100644 +index 0000000000..2346b18f01 +--- /dev/null ++++ b/meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch +@@ -0,0 +1,188 @@ ++From 7df481dd76c05c89782721e9df5468be829c356b Mon Sep 17 00:00:00 2001 ++From: Alan Modra <[email protected]> ++Date: Sat, 22 Nov 2025 09:22:10 +1030 ++Subject: [PATCH] PR 33638, debug_rnglists output ++ ++The fuzzed testcase in this PR continuously outputs an error about ++the debug_rnglists header. Fixed by taking notice of the error and ++stopping output. The patch also limits the length in all cases, not ++just when a relocation is present, and limits the offset entry count ++read from the header. I removed the warning and the test for relocs ++because the code can't work reliably with unresolved relocs in the ++length field. ++ ++ PR 33638 ++ * dwarf.c (display_debug_rnglists_list): Return bool. Rename ++ "inital_length" to plain "length". Verify length is large ++ enough to read header. Limit length to rest of section. ++ Similarly limit offset_entry_count. ++ (display_debug_ranges): Check display_debug_rnglists_unit_header ++ return status. Stop output on error. ++ ++CVE: CVE-2025-69648 ++Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33] ++ ++(cherry picked from commit 598704a00cbac5e85c2bedd363357b5bf6fcee33) ++Signed-off-by: Deepak Rathore <[email protected]> ++--- ++ binutils/dwarf.c | 67 ++++++++++++++++++++++++------------------------ ++ 1 file changed, 34 insertions(+), 33 deletions(-) ++ ++diff --git a/binutils/dwarf.c b/binutils/dwarf.c ++index f4bcb677761..b4fb56351ec 100644 ++--- a/binutils/dwarf.c +++++ b/binutils/dwarf.c ++@@ -8282,7 +8282,7 @@ display_debug_rnglists_list (unsigned char * start, ++ return start; ++ } ++ ++-static int +++static bool ++ display_debug_rnglists_unit_header (struct dwarf_section * section, ++ uint64_t * unit_offset, ++ unsigned char * poffset_size) ++@@ -8290,7 +8290,8 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, ++ uint64_t start_offset = *unit_offset; ++ unsigned char * p = section->start + start_offset; ++ unsigned char * finish = section->start + section->size; ++- uint64_t initial_length; +++ unsigned char * hdr; +++ uint64_t length; ++ unsigned char segment_selector_size; ++ unsigned int offset_entry_count; ++ unsigned int i; ++@@ -8299,66 +8300,59 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, ++ unsigned char offset_size; ++ ++ /* Get and check the length of the block. */ ++- SAFE_BYTE_GET_AND_INC (initial_length, p, 4, finish); +++ SAFE_BYTE_GET_AND_INC (length, p, 4, finish); ++ ++- if (initial_length == 0xffffffff) +++ if (length == 0xffffffff) ++ { ++ /* This section is 64-bit DWARF 3. */ ++- SAFE_BYTE_GET_AND_INC (initial_length, p, 8, finish); +++ SAFE_BYTE_GET_AND_INC (length, p, 8, finish); ++ *poffset_size = offset_size = 8; ++ } ++ else ++ *poffset_size = offset_size = 4; ++ ++- if (initial_length > (size_t) (finish - p)) ++- { ++- /* If the length field has a relocation against it, then we should ++- not complain if it is inaccurate (and probably negative). ++- It is copied from .debug_line handling code. */ ++- if (reloc_at (section, (p - section->start) - offset_size)) ++- initial_length = finish - p; ++- else ++- { ++- warn (_("The length field (%#" PRIx64 ++- ") in the debug_rnglists header is wrong" ++- " - the section is too small\n"), ++- initial_length); ++- return 0; ++- } ++- } ++- ++- /* Report the next unit offset to the caller. */ ++- *unit_offset = (p - section->start) + initial_length; +++ if (length < 8) +++ return false; ++ ++ /* Get the other fields in the header. */ +++ hdr = p; ++ SAFE_BYTE_GET_AND_INC (version, p, 2, finish); ++ SAFE_BYTE_GET_AND_INC (address_size, p, 1, finish); ++ SAFE_BYTE_GET_AND_INC (segment_selector_size, p, 1, finish); ++ SAFE_BYTE_GET_AND_INC (offset_entry_count, p, 4, finish); ++ ++ printf (_(" Table at Offset: %#" PRIx64 ":\n"), start_offset); ++- printf (_(" Length: %#" PRIx64 "\n"), initial_length); +++ printf (_(" Length: %#" PRIx64 "\n"), length); ++ printf (_(" DWARF version: %u\n"), version); ++ printf (_(" Address size: %u\n"), address_size); ++ printf (_(" Segment size: %u\n"), segment_selector_size); ++ printf (_(" Offset entries: %u\n"), offset_entry_count); ++ +++ if (length > (size_t) (finish - hdr)) +++ length = finish - hdr; +++ +++ /* Report the next unit offset to the caller. */ +++ *unit_offset = (hdr - section->start) + length; +++ ++ /* Check the fields. */ ++ if (segment_selector_size != 0) ++ { ++ warn (_("The %s section contains " ++ "unsupported segment selector size: %d.\n"), ++ section->name, segment_selector_size); ++- return 0; +++ return false; ++ } ++ ++ if (version < 5) ++ { ++ warn (_("Only DWARF version 5+ debug_rnglists info " ++ "is currently supported.\n")); ++- return 0; +++ return false; ++ } ++ +++ uint64_t max_off_count = (length - 8) / offset_size; +++ if (offset_entry_count > max_off_count) +++ offset_entry_count = max_off_count; ++ if (offset_entry_count != 0) ++ { ++ printf (_("\n Offsets starting at %#tx:\n"), p - section->start); ++@@ -8372,7 +8366,7 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, ++ } ++ } ++ ++- return 1; +++ return true; ++ } ++ ++ static bool ++@@ -8404,6 +8398,7 @@ display_debug_ranges (struct dwarf_section *section, ++ uint64_t last_offset = 0; ++ uint64_t next_rnglists_cu_offset = 0; ++ unsigned char offset_size; +++ bool ok_header = true; ++ ++ if (bytes == 0) ++ { ++@@ -8493,8 +8488,12 @@ display_debug_ranges (struct dwarf_section *section, ++ /* If we've moved on to the next compile unit in the rnglists section - dump the unit header(s). */ ++ if (is_rnglists && next_rnglists_cu_offset < offset) ++ { ++- while (next_rnglists_cu_offset < offset) ++- display_debug_rnglists_unit_header (section, &next_rnglists_cu_offset, &offset_size); +++ while (ok_header && next_rnglists_cu_offset < offset) +++ ok_header = display_debug_rnglists_unit_header (section, +++ &next_rnglists_cu_offset, +++ &offset_size); +++ if (!ok_header) +++ break; ++ printf (_(" Offset Begin End\n")); ++ } ++ ++@@ -8548,10 +8547,12 @@ display_debug_ranges (struct dwarf_section *section, ++ } ++ ++ /* Display trailing empty (or unreferenced) compile units, if any. */ ++- if (is_rnglists) +++ if (is_rnglists && ok_header) ++ while (next_rnglists_cu_offset < section->size) ++- display_debug_rnglists_unit_header (section, &next_rnglists_cu_offset, &offset_size); ++- +++ if (!display_debug_rnglists_unit_header (section, +++ &next_rnglists_cu_offset, +++ &offset_size)) +++ break; ++ putchar ('\n'); ++ ++ free (range_entries); ++-- ++2.35.6 +-- +2.51.0 +meta/recipes-devtools/binutils/binutils-2.45.inc +1
-0@@ -46,4 +46,5 @@ SRC_URI = "\ file://0018-CVE-2025-11494.patch \ file://0019-CVE-2025-11839.patch \ file://0020-CVE-2025-11840.patch \ + file://CVE-2025-69648.patch \ "meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch new file +189
-0@@ -0,0 +1,189 @@ +From 7df481dd76c05c89782721e9df5468be829c356b Mon Sep 17 00:00:00 2001 +From: Alan Modra <[email protected]> +Date: Sat, 22 Nov 2025 09:22:10 +1030 +Subject: [PATCH] PR 33638, debug_rnglists output + +The fuzzed testcase in this PR continuously outputs an error about +the debug_rnglists header. Fixed by taking notice of the error and +stopping output. The patch also limits the length in all cases, not +just when a relocation is present, and limits the offset entry count +read from the header. I removed the warning and the test for relocs +because the code can't work reliably with unresolved relocs in the +length field. + + PR 33638 + * dwarf.c (display_debug_rnglists_list): Return bool. Rename + "inital_length" to plain "length". Verify length is large + enough to read header. Limit length to rest of section. + Similarly limit offset_entry_count. + (display_debug_ranges): Check display_debug_rnglists_unit_header + return status. Stop output on error. + +CVE: CVE-2025-69648 +Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33] + +(cherry picked from commit 598704a00cbac5e85c2bedd363357b5bf6fcee33) +Signed-off-by: Deepak Rathore <[email protected]> +--- + binutils/dwarf.c | 67 ++++++++++++++++++++++++------------------------ + 1 file changed, 34 insertions(+), 33 deletions(-) + +diff --git a/binutils/dwarf.c b/binutils/dwarf.c +index f4bcb677761..b4fb56351ec 100644 +--- a/binutils/dwarf.c ++++ b/binutils/dwarf.c +@@ -8282,7 +8282,7 @@ display_debug_rnglists_list (unsigned char * start, + return start; + } + +-static int ++static bool + display_debug_rnglists_unit_header (struct dwarf_section * section, + uint64_t * unit_offset, + unsigned char * poffset_size) +@@ -8290,7 +8290,8 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, + uint64_t start_offset = *unit_offset; + unsigned char * p = section->start + start_offset; + unsigned char * finish = section->start + section->size; +- uint64_t initial_length; ++ unsigned char * hdr; ++ uint64_t length; + unsigned char segment_selector_size; + unsigned int offset_entry_count; + unsigned int i; +@@ -8299,66 +8300,59 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, + unsigned char offset_size; + + /* Get and check the length of the block. */ +- SAFE_BYTE_GET_AND_INC (initial_length, p, 4, finish); ++ SAFE_BYTE_GET_AND_INC (length, p, 4, finish); + +- if (initial_length == 0xffffffff) ++ if (length == 0xffffffff) + { + /* This section is 64-bit DWARF 3. */ +- SAFE_BYTE_GET_AND_INC (initial_length, p, 8, finish); ++ SAFE_BYTE_GET_AND_INC (length, p, 8, finish); + *poffset_size = offset_size = 8; + } + else + *poffset_size = offset_size = 4; + +- if (initial_length > (size_t) (finish - p)) +- { +- /* If the length field has a relocation against it, then we should +- not complain if it is inaccurate (and probably negative). +- It is copied from .debug_line handling code. */ +- if (reloc_at (section, (p - section->start) - offset_size)) +- initial_length = finish - p; +- else +- { +- warn (_("The length field (%#" PRIx64 +- ") in the debug_rnglists header is wrong" +- " - the section is too small\n"), +- initial_length); +- return 0; +- } +- } +- +- /* Report the next unit offset to the caller. */ +- *unit_offset = (p - section->start) + initial_length; ++ if (length < 8) ++ return false; + + /* Get the other fields in the header. */ ++ hdr = p; + SAFE_BYTE_GET_AND_INC (version, p, 2, finish); + SAFE_BYTE_GET_AND_INC (address_size, p, 1, finish); + SAFE_BYTE_GET_AND_INC (segment_selector_size, p, 1, finish); + SAFE_BYTE_GET_AND_INC (offset_entry_count, p, 4, finish); + + printf (_(" Table at Offset: %#" PRIx64 ":\n"), start_offset); +- printf (_(" Length: %#" PRIx64 "\n"), initial_length); ++ printf (_(" Length: %#" PRIx64 "\n"), length); + printf (_(" DWARF version: %u\n"), version); + printf (_(" Address size: %u\n"), address_size); + printf (_(" Segment size: %u\n"), segment_selector_size); + printf (_(" Offset entries: %u\n"), offset_entry_count); + ++ if (length > (size_t) (finish - hdr)) ++ length = finish - hdr; ++ ++ /* Report the next unit offset to the caller. */ ++ *unit_offset = (hdr - section->start) + length; ++ + /* Check the fields. */ + if (segment_selector_size != 0) + { + warn (_("The %s section contains " + "unsupported segment selector size: %d.\n"), + section->name, segment_selector_size); +- return 0; ++ return false; + } + + if (version < 5) + { + warn (_("Only DWARF version 5+ debug_rnglists info " + "is currently supported.\n")); +- return 0; ++ return false; + } + ++ uint64_t max_off_count = (length - 8) / offset_size; ++ if (offset_entry_count > max_off_count) ++ offset_entry_count = max_off_count; + if (offset_entry_count != 0) + { + printf (_("\n Offsets starting at %#tx:\n"), p - section->start); +@@ -8372,7 +8366,7 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, + } + } + +- return 1; ++ return true; + } + + static bool +@@ -8404,6 +8398,7 @@ display_debug_ranges (struct dwarf_section *section, + uint64_t last_offset = 0; + uint64_t next_rnglists_cu_offset = 0; + unsigned char offset_size; ++ bool ok_header = true; + + if (bytes == 0) + { +@@ -8493,8 +8488,12 @@ display_debug_ranges (struct dwarf_section *section, + /* If we've moved on to the next compile unit in the rnglists section - dump the unit header(s). */ + if (is_rnglists && next_rnglists_cu_offset < offset) + { +- while (next_rnglists_cu_offset < offset) +- display_debug_rnglists_unit_header (section, &next_rnglists_cu_offset, &offset_size); ++ while (ok_header && next_rnglists_cu_offset < offset) ++ ok_header = display_debug_rnglists_unit_header (section, ++ &next_rnglists_cu_offset, ++ &offset_size); ++ if (!ok_header) ++ break; + printf (_(" Offset Begin End\n")); + } + +@@ -8548,10 +8547,12 @@ display_debug_ranges (struct dwarf_section *section, + } + + /* Display trailing empty (or unreferenced) compile units, if any. */ +- if (is_rnglists) ++ if (is_rnglists && ok_header) + while (next_rnglists_cu_offset < section->size) +- display_debug_rnglists_unit_header (section, &next_rnglists_cu_offset, &offset_size); +- ++ if (!display_debug_rnglists_unit_header (section, ++ &next_rnglists_cu_offset, ++ &offset_size)) ++ break; + putchar ('\n'); + + free (range_entries); +-- +2.35.6 +
Signature · 2 lines
Yoann Congal Smile ECS
PATCH v3 1/4 binutils: Fix CVE-2025-69648
In reply to Deepak Rathore -X (deeratho - E INFOCHIPS PRIVATE LIMITED at Cisco)From: Deepak Rathore <[email protected]>
Pick the patch [1] as mentioned in [2].
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33
[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69648
meta/recipes-devtools/binutils/binutils-2.45.inc +1 -0
@@ -46,4 +46,5 @@ SRC_URI = "\ file://0018-CVE-2025-11494.patch \ file://0019-CVE-2025-11839.patch \ file://0020-CVE-2025-11840.patch \ + file://CVE-2025-69648.patch \ "
meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch new file +189 -0
189 lines not on this page · raw message
Signature · 1 line
2.35.6
Quoted 57 lines · Deepak Rathore via lists.openembedded.org
From: Deepak Rathore <[email protected]>
Pick the patch [1] as mentioned in [2].
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33
[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69648Signed-off-by Deepak Rathore <[email protected]>meta/recipes-devtools/binutils/binutils-2.45.inc +1
-0@@ -46,4 +46,5 @@ SRC_URI = "\ file://0018-CVE-2025-11494.patch \ file://0019-CVE-2025-11839.patch \ file://0020-CVE-2025-11840.patch \ + file://CVE-2025-69648.patch \ "meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch new file +32
-0@@ -0,0 +1,188 @@ +From da5460f518952684a8c774d9b202a395676ff85f Mon Sep 17 00:00:00 2001 +From: Alan Modra <[email protected]> +Date: Sat, 22 Nov 2025 09:22:10 +1030 +Subject: [PATCH] PR 33638, debug_rnglists output + +The fuzzed testcase in this PR continuously outputs an error about +the debug_rnglists header. Fixed by taking notice of the error and +stopping output. The patch also limits the length in all cases, not +just when a relocation is present, and limits the offset entry count +read from the header. I removed the warning and the test for relocs +because the code can't work reliably with unresolved relocs in the +length field. + + PR 33638 + * dwarf.c (display_debug_rnglists_list): Return bool. Rename + "inital_length" to plain "length". Verify length is large + enough to read header. Limit length to rest of section. + Similarly limit offset_entry_count. + (display_debug_ranges): Check display_debug_rnglists_unit_header + return status. Stop output on error. + +CVE: CVE-2025-69648 +Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33] + +(cherry picked from commit 598704a00cbac5e85c2bedd363357b5bf6fcee33) +Signed-off-by: Deepak Rathore <[email protected]> +--- + binutils/dwarf.c | 67 ++++++++++++++++++++++++------------------------ + 1 file changed, 34 insertions(+), 33 deletions(-) + +diff --git a/binutils/dwarf.c b/binutils/dwarf.c +index d9f514180de..0d88ea94619 100644
meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch line 42
Quoted 10 lines
meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch new file +10
-0+--- a/binutils/dwarf.c ++++ b/binutils/dwarf.c +@@ -8292,7 +8292,7 @@ display_debug_rnglists_list (unsigned char * start, + return start; + } + +-static int ++static bool + display_debug_rnglists_unit_header (struct dwarf_section * section, + uint64_t * unit_offset,
Hello,
This patch and other in the whole series has a weird format. The context lines starts with tabs and not a single space as usual. While it seems like it passes tests, I'm afraid it will break something down the line and I'd rather not take this like this.
Can you please check?
Thanks!
Quoted 146 lines
meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch new file +146
-0+ unsigned char * poffset_size) +@@ -8300,7 +8300,8 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, + uint64_t start_offset = *unit_offset; + unsigned char * p = section->start + start_offset; + unsigned char * finish = section->start + section->size; +- uint64_t initial_length; ++ unsigned char * hdr; ++ uint64_t length; + unsigned char segment_selector_size; + unsigned int offset_entry_count; + unsigned int i; +@@ -8309,66 +8310,59 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, + unsigned char offset_size; + + /* Get and check the length of the block. */ +- SAFE_BYTE_GET_AND_INC (initial_length, p, 4, finish); ++ SAFE_BYTE_GET_AND_INC (length, p, 4, finish); + +- if (initial_length == 0xffffffff) ++ if (length == 0xffffffff) + { + /* This section is 64-bit DWARF 3. */ +- SAFE_BYTE_GET_AND_INC (initial_length, p, 8, finish); ++ SAFE_BYTE_GET_AND_INC (length, p, 8, finish); + *poffset_size = offset_size = 8; + } + else + *poffset_size = offset_size = 4; + +- if (initial_length > (size_t) (finish - p)) +- { +- /* If the length field has a relocation against it, then we should +- not complain if it is inaccurate (and probably negative). +- It is copied from .debug_line handling code. */ +- if (reloc_at (section, (p - section->start) - offset_size)) +- initial_length = finish - p; +- else +- { +- warn (_("The length field (%#" PRIx64 +- ") in the debug_rnglists header is wrong" +- " - the section is too small\n"), +- initial_length); +- return 0; +- } +- } +- +- /* Report the next unit offset to the caller. */ +- *unit_offset = (p - section->start) + initial_length; ++ if (length < 8) ++ return false; + + /* Get the other fields in the header. */ ++ hdr = p; + SAFE_BYTE_GET_AND_INC (version, p, 2, finish); + SAFE_BYTE_GET_AND_INC (address_size, p, 1, finish); + SAFE_BYTE_GET_AND_INC (segment_selector_size, p, 1, finish); + SAFE_BYTE_GET_AND_INC (offset_entry_count, p, 4, finish); + + printf (_(" Table at Offset: %#" PRIx64 ":\n"), start_offset); +- printf (_(" Length: %#" PRIx64 "\n"), initial_length); ++ printf (_(" Length: %#" PRIx64 "\n"), length); + printf (_(" DWARF version: %u\n"), version); + printf (_(" Address size: %u\n"), address_size); + printf (_(" Segment size: %u\n"), segment_selector_size); + printf (_(" Offset entries: %u\n"), offset_entry_count); + ++ if (length > (size_t) (finish - hdr)) ++ length = finish - hdr; ++ ++ /* Report the next unit offset to the caller. */ ++ *unit_offset = (hdr - section->start) + length; ++ + /* Check the fields. */ + if (segment_selector_size != 0) + { + warn (_("The %s section contains " + "unsupported segment selector size: %d.\n"), + section->name, segment_selector_size); +- return 0; ++ return false; + } + + if (version < 5) + { + warn (_("Only DWARF version 5+ debug_rnglists info " + "is currently supported.\n")); +- return 0; ++ return false; + } + ++ uint64_t max_off_count = (length - 8) / offset_size; ++ if (offset_entry_count > max_off_count) ++ offset_entry_count = max_off_count; + if (offset_entry_count != 0) + { + printf (_("\n Offsets starting at %#tx:\n"), p - section->start); +@@ -8382,7 +8376,7 @@ display_debug_rnglists_unit_header (struct dwarf_section * section, + } + } + +- return 1; ++ return true; + } + + static bool +@@ -8414,6 +8408,7 @@ display_debug_ranges (struct dwarf_section *section, + uint64_t last_offset = 0; + uint64_t next_rnglists_cu_offset = 0; + unsigned char offset_size; ++ bool ok_header = true; + + if (bytes == 0) + { +@@ -8503,8 +8498,12 @@ display_debug_ranges (struct dwarf_section *section, + /* If we've moved on to the next compile unit in the rnglists section - dump the unit header(s). */ + if (is_rnglists && next_rnglists_cu_offset < offset) + { +- while (next_rnglists_cu_offset < offset) +- display_debug_rnglists_unit_header (section, &next_rnglists_cu_offset, &offset_size); ++ while (ok_header && next_rnglists_cu_offset < offset) ++ ok_header = display_debug_rnglists_unit_header (section, ++ &next_rnglists_cu_offset, ++ &offset_size); ++ if (!ok_header) ++ break; + printf (_(" Offset Begin End\n")); + } + +@@ -8558,10 +8557,12 @@ display_debug_ranges (struct dwarf_section *section, + } + + /* Display trailing empty (or unreferenced) compile units, if any. */ +- if (is_rnglists) ++ if (is_rnglists && ok_header) + while (next_rnglists_cu_offset < section->size) +- display_debug_rnglists_unit_header (section, &next_rnglists_cu_offset, &offset_size); +- ++ if (!display_debug_rnglists_unit_header (section, ++ &next_rnglists_cu_offset, ++ &offset_size)) ++ break; + putchar ('\n'); + + free (range_entries); +-- +2.35.6
Signature · 2 lines
Yoann Congal Smile ECS
Thanks, Yoann, for your review.
I have corrected all the patches and sent to you for your review.
Regards,
Deepak
Quoted 3 lines · Deepak Rathore via lists.openembedded.org
Thanks, Yoann, for your review.
I have corrected all the patches and sent to you for your review.
Can you please resend a full series instead of individual patches?
And, while you are on it, "[whinlatter][PATCH v2 1/4] binutils: Fix CVE-2025-69648" add a patch that would apply to oe-core itself, not binutils.
Thanks!
Quoted 3 lines
Regards,
Deepak
Signature · 2 lines
Yoann Congal Smile ECS
Hi Yoann,
I have corrected it and send you full series as below:
* https://lists.openembedded.org/g/openembedded-core/message/234490?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C%2Cbinutils%2C20%2C2%2C0%2C118629717
* https://lists.openembedded.org/g/openembedded-core/message/234491?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C%2Cbinutils%2C20%2C2%2C0%2C118629726
* https://lists.openembedded.org/g/openembedded-core/message/234492?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C%2Cbinutils%2C20%2C2%2C0%2C118629735
* https://lists.openembedded.org/g/openembedded-core/message/234493?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C%2Cbinutils%2C20%2C2%2C0%2C118629743
Regards,
Deepak
PATCH v2 2/4 binutils: Fix CVE-2025-69644 CVE-2025-69647
In reply to Deepak Rathore -X (deeratho - E INFOCHIPS PRIVATE LIMITED at Cisco)From: Deepak Rathore <[email protected]>
Pick the patch [1] as mentioned in [2] and [3].
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=455446bbdc8675f34808187de2bbad4682016ff7
[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69644
[3] https://nvd.nist.gov/vuln/detail/CVE-2025-69647
---
Changes from v1 -> v2:
- Rephrase the patch on top of CVE-2025-69648 patch
- Update the commit message to include both CVE-2025-69644 and CVE-2025-69647
- Update the CVE-ID patch name to include both CVE-2025-69644 and CVE-2025-69647
- Add CVE-2025-69647 in the CVE field in the commit message
meta/recipes-devtools/binutils/binutils-2.45.inc +1 -0
@@ -47,4 +47,5 @@ SRC_URI = "\ file://0019-CVE-2025-11839.patch \ file://0020-CVE-2025-11840.patch \ file://CVE-2025-69648.patch \ + file://CVE-2025-69644_CVE-2025-69647.patch \ "
meta/recipes-devtools/binutils/binutils/CVE-2025-69644_CVE-2025-69647.patch new file +84 -0
84 lines not on this page · raw message
Signature · 1 line
2.35.6
PATCH v3 4/4 binutils: Fix CVE-2025-69652
In reply to Deepak Rathore -X (deeratho - E INFOCHIPS PRIVATE LIMITED at Cisco)From: Deepak Rathore <[email protected]>
Pick the patch [1] as mentioned in [2].
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=44b79abd0fa12e7947252eb4c6e5d16ed6033e01
[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69652
meta/recipes-devtools/binutils/binutils-2.45.inc +1 -0
@@ -49,4 +49,5 @@ SRC_URI = "\ file://CVE-2025-69648.patch \ file://CVE-2025-69644_CVE-2025-69647.patch \ file://CVE-2025-69649.patch \ + file://CVE-2025-69652.patch \ "
meta/recipes-devtools/binutils/binutils/CVE-2025-69652.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 5a2f57ab03067f6622c19983e1e31207bd2293a6 Mon Sep 17 00:00:00 2001 +From: Alan Modra <[email protected]> +Date: Mon, 8 Dec 2025 16:04:44 +1030 +Subject: [PATCH] PR 33701, abort in byte_get_little_endian + + PR 33701 + * dwarf.c (process_debug_info): Set debug_info_p NULL when + DEBUG_INFO_UNAVAILABLE. + +CVE: CVE-2025-69652 +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=44b79abd0fa12e7947252eb4c6e5d16ed6033e01] + +(cherry picked from commit 44b79abd0fa12e7947252eb4c6e5d16ed6033e01) +Signed-off-by: Deepak Rathore <[email protected]> +--- + binutils/dwarf.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/binutils/dwarf.c b/binutils/dwarf.c +index 2462e6540a7..0d88ea94619 100644 +--- a/binutils/dwarf.c ++++ b/binutils/dwarf.c +@@ -4248,9 +4248,11 @@ process_debug_info (struct dwarf_section * section, + break; + } + +- debug_info *debug_info_p = ((debug_information +- && unit < alloc_num_debug_info_entries) +- ? debug_information + unit : NULL); ++ debug_info *debug_info_p = NULL; ++ if (debug_information ++ && num_debug_info_entries != DEBUG_INFO_UNAVAILABLE ++ && unit < alloc_num_debug_info_entries) ++ debug_info_p = debug_information + unit; + + assert (!debug_info_p + || (debug_info_p->num_loc_offsets +-- +2.35.6 +
Signature · 1 line
2.35.6
PATCH v4 3/4 binutils: Fix CVE-2025-69649
In reply to Deepak Rathore -X (deeratho - E INFOCHIPS PRIVATE LIMITED at Cisco)From: Deepak Rathore <[email protected]>
Pick the patch [1] as mentioned in [2]
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=66a3492ce68e1ae45b2489bd9a815c39ea5d7f66
[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69649
meta/recipes-devtools/binutils/binutils-2.45.inc +1 -0
@@ -48,4 +48,5 @@ SRC_URI = "\ file://0020-CVE-2025-11840.patch \ file://CVE-2025-69648.patch \ file://CVE-2025-69644_CVE-2025-69647.patch \ + file://CVE-2025-69649.patch \ "
meta/recipes-devtools/binutils/binutils/CVE-2025-69649.patch new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.35.6
PATCH v4 4/4 binutils: Fix CVE-2025-69652
In reply to Deepak Rathore -X (deeratho - E INFOCHIPS PRIVATE LIMITED at Cisco)From: Deepak Rathore <[email protected]>
Pick the patch [1] as mentioned in [2].
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=44b79abd0fa12e7947252eb4c6e5d16ed6033e01
[2] https://nvd.nist.gov/vuln/detail/CVE-2025-69652
meta/recipes-devtools/binutils/binutils-2.45.inc +1 -0
@@ -49,4 +49,5 @@ SRC_URI = "\ file://CVE-2025-69648.patch \ file://CVE-2025-69644_CVE-2025-69647.patch \ file://CVE-2025-69649.patch \ + file://CVE-2025-69652.patch \ "
meta/recipes-devtools/binutils/binutils/CVE-2025-69652.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 5a2f57ab03067f6622c19983e1e31207bd2293a6 Mon Sep 17 00:00:00 2001 +From: Alan Modra <[email protected]> +Date: Mon, 8 Dec 2025 16:04:44 +1030 +Subject: [PATCH] PR 33701, abort in byte_get_little_endian + + PR 33701 + * dwarf.c (process_debug_info): Set debug_info_p NULL when + DEBUG_INFO_UNAVAILABLE. + +CVE: CVE-2025-69652 +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=44b79abd0fa12e7947252eb4c6e5d16ed6033e01] + +(cherry picked from commit 44b79abd0fa12e7947252eb4c6e5d16ed6033e01) +Signed-off-by: Deepak Rathore <[email protected]> +--- + binutils/dwarf.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/binutils/dwarf.c b/binutils/dwarf.c +index 2462e6540a7..0d88ea94619 100644 +--- a/binutils/dwarf.c ++++ b/binutils/dwarf.c +@@ -4248,9 +4248,11 @@ process_debug_info (struct dwarf_section * section, + break; + } + +- debug_info *debug_info_p = ((debug_information +- && unit < alloc_num_debug_info_entries) +- ? debug_information + unit : NULL); ++ debug_info *debug_info_p = NULL; ++ if (debug_information ++ && num_debug_info_entries != DEBUG_INFO_UNAVAILABLE ++ && unit < alloc_num_debug_info_entries) ++ debug_info_p = debug_information + unit; + + assert (!debug_info_p + || (debug_info_p->num_loc_offsets +-- +2.35.6 +
Signature · 1 line
2.35.6